gitweb / test / file with spaceson commit Use nice names in conflict markers during cherry-pick/revert. (6e2931a)
   1This
   2filename
   3contains
   4spaces.